Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Oct 2011 18:20:24 +0000 (11:20 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Oct 2011 18:20:24 +0000 (11:20 -0700)
commit0ec6c302a3d1cb7f45eae239d9d0455929c31183
treed3390a1f5d78a19724233256e7bdeddd5a376ea6
parent8c1d6393e14b441cd5a17f2f4a05680d64291429
parent01d86873825b385ac8e0731f78a50143565a7ba4
Merge from trunk.
src/ChangeLog
src/gnutls.c
src/gnutls.h
src/image.c
src/process.c
src/w32fns.c
src/window.c